From 6bbf46a7ea1922701f259c8221e441eaf37a1767 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Fri, 25 May 2007 09:40:43 -0600 Subject: [PATCH] [IA64] Trivial warning fix contiguous_bitmap_init has implicit declaration Signed-off-by: Isaku Yamahata --- linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 2 +- linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c | 2 +- linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c index c7af364b42..38b4f3f5aa 100644 --- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c +++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c @@ -610,7 +610,7 @@ setup_arch (char **cmdline_p) #endif paging_init(); #ifdef CONFIG_XEN - contiguous_bitmap_init(max_pfn); + xen_contiguous_bitmap_init(max_pfn); #endif } diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c index e895ef0d96..eccb41f8ae 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c @@ -158,7 +158,7 @@ __contiguous_bitmap_init(unsigned long size) } void -contiguous_bitmap_init(unsigned long end_pfn) +xen_contiguous_bitmap_init(unsigned long end_pfn) { unsigned long size = (end_pfn + 2 * BITS_PER_LONG) >> 3; #ifndef CONFIG_VIRTUAL_MEM_MAP diff --git a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h index aeee02c672..da23818b6d 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h @@ -145,6 +145,7 @@ int privcmd_mmap(struct file * file, struct vm_area_struct * vma); #define pfn_pte_ma(_x,_y) __pte_ma(0) /* unmodified use */ #ifndef CONFIG_VMX_GUEST +void xen_contiguous_bitmap_init(unsigned long end_pfn); int __xen_create_contiguous_region(unsigned long vstart, unsigned int order, unsigned int address_bits); static inline int xen_create_contiguous_region(unsigned long vstart, -- 2.30.2